From efaa2aa3e3370342137354a44ada4ea75c19e880 Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Wed, 28 Jun 2006 17:36:38 +0100 Subject: [PATCH] Comment out the load of the resource label file, pending a solution to the problem that we now require xml.marshal.generic. Signed-off-by: Ewan Mellor --- tools/python/xen/util/security.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/python/xen/util/security.py b/tools/python/xen/util/security.py index 9749d6b5c6..df970f355e 100644 --- a/tools/python/xen/util/security.py +++ b/tools/python/xen/util/security.py @@ -22,7 +22,7 @@ import logging import sys, os, string, re import traceback import shutil -from xml.marshal import generic +#from xml.marshal import generic from xen.lowlevel import acm from xen.xend import sxp from xen.xend.XendLogging import log @@ -555,13 +555,16 @@ def get_res_label(resource): if not os.path.isfile(configfile): log.info("Resource label file not found.") return default_res_label() - fd = open(configfile, "rb") - res_label_cache = generic.load(fd) - fd.close() +# +# Commented out pending replacement for xml.marshal.generic +# +# fd = open(configfile, "rb") +# res_label_cache = generic.load(fd) +# fd.close() - # find the resource information - if res_label_cache.has_key(resource): - (policy, label) = res_label_cache[resource] +# # find the resource information +# if res_label_cache.has_key(resource): +# (policy, label) = res_label_cache[resource] return (label, policy) -- 2.30.2